Skip to content

FIT: new feature("--file-for") for digit2raw#6935

Merged
davidrohr merged 10 commits into
AliceO2Group:devfrom
afurs:dev_fit
Sep 1, 2021
Merged

FIT: new feature("--file-for") for digit2raw#6935
davidrohr merged 10 commits into
AliceO2Group:devfrom
afurs:dev_fit

Conversation

@afurs

@afurs afurs commented Aug 31, 2021

Copy link
Copy Markdown
Collaborator

No description provided.

@afurs

afurs commented Aug 31, 2021

Copy link
Copy Markdown
Collaborator Author

@shahor02 , @davidrohr as you requested, new "--file-for" feature is prepared for FIT's digit2raw. FLP name could be defined via --flp-name(by default "alio2-cr1-flp180"). Because 2 new FLPs are not installed yet for FIT(3 in total, 1 for each subdetector) and we don't know new flp names, I putted "-fv0"/"-fdd" suffix in default flp name. And "--file-per-link" is removed

shahor02
shahor02 previously approved these changes Aug 31, 2021

@shahor02 shahor02 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@davidrohr davidrohr left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, but you will also need to change the option in O2/prodtests/full-system-test/dpl-workflow.sh, otherwise the FullCI will fail

@afurs

afurs commented Aug 31, 2021

Copy link
Copy Markdown
Collaborator Author

@davidrohr but what exactly should I change in O2/prodtests/full-system-test/dpl-workflow.sh? I didn't find any sign of digit2raw. Didi you mean prodtests/full-system-test/create_full_system_pipeline.py ?

@afurs afurs requested a review from a team as a code owner August 31, 2021 13:47
@davidrohr

Copy link
Copy Markdown
Collaborator

@afurs : Oh, sorry, I meant `prodtests/full_system_test.sh?

@afurs

afurs commented Aug 31, 2021

Copy link
Copy Markdown
Collaborator Author

@davidrohr , ok, it's done for full_system_test.sh but I also changed options in 4f52165 Should I cancel it?

@davidrohr

Copy link
Copy Markdown
Collaborator

@davidrohr , ok, it's done for full_system_test.sh but I also changed options in 4f52165 Should I cancel it?

no, everything is fine now (the other file is currently not used and not checked in the CI, so would not have broken the CI)

// add_option("input-file,i", bpo::value<std::string>()->default_value(o2::base::NameConf::getDigitsFileName(o2::detectors::DetID::FT0)),"input FT0 digits file"); // why not used?
add_option("input-file,i", bpo::value<std::string>()->default_value("ft0digits.root"), "input FT0 digits file");
add_option("file-per-link,l", bpo::value<bool>()->default_value(false)->implicit_value(true), "create output file per CRU (default: per layer)");
add_option("flp-name", bpo::value<std::string>()->default_value("alio2-cr1-flp180"), "single file per: all,flp,cru,link");

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, the comment for this option seems to be wrong, I guess copy&paste error.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, sorry, i can change it in next PR(in few hours)

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, I meant after merging this one :) It will be not in few hours

@afurs

afurs commented Aug 31, 2021

Copy link
Copy Markdown
Collaborator Author

@davidrohr @shahor02 there are conflict in prodtests/full_system_test.sh

@davidrohr

Copy link
Copy Markdown
Collaborator

@afurs : ok, never mind, that happens now since multiple detectors have to edit the same file. If the fullCI succeeds I'll resolve the conflict manually and merge it. Otherwise you'll have to resolve and push a new commit.

@davidrohr

Copy link
Copy Markdown
Collaborator

CI had passed, just merged the conflict with prior change in TPC part of FST, merging

@davidrohr davidrohr merged commit 70f0944 into AliceO2Group:dev Sep 1, 2021
@afurs afurs deleted the dev_fit branch September 23, 2021 13:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants